Merge proposals dependent on lp://qastaging/~josharenson/unity8/fix-greeter-password-focus-backport

1. fix-greeter-password-focus-backport
2. Dependent merge proposals