Merge proposals dependent on lp://qastaging/~charlesk/indicator-messages/lp-1493534-fix-null-error-dereference

1. lp-1493534-fix-null-error-dereference
2. Dependent merge proposals