Merge proposals dependent on lp://staging/~philip.scott/wingpanel-indicator-power/hide-settings-in-greeter

1. hide-settings-in-greeter
2. Dependent merge proposals