Merge proposals dependent on lp://qastaging/~binli/unity-settings-daemon/dont-scale-out-of-screen

1. dont-scale-out-of-screen
2. Dependent merge proposals