Merge proposals dependent on lp://qastaging/~charlesk/indicator-messages/lp-1377294-indicator-order-change-on-phone

1. lp-1377294-indicator-order-change-on-phone
2. Dependent merge proposals