Merge proposals dependent on lp://qastaging/~charlesk/indicator-power/lp-1470080-missing-icon-when-apple-devices-connected

1. lp-1470080-missing-icon-when-apple-devices-connected
2. Dependent merge proposals