Merge "fix 2517656 Pin/Password Unlocks place focus on the launcher screen when they shouldn't"