Merge proposals dependent on lp://qastaging/~brandontschaefer/gnome-settings-daemon/unity-super-l-lock-screen-patch

1. unity-super-l-lock-screen-patch
2. Dependent merge proposals