Merge proposals dependent on lp://staging/~indicator-applet-developers/unity8/indicator-power-autopilot-test

1. indicator-power-autopilot-test
2. Dependent merge proposals