Merge "Dismiss keyguard when switching user if lockscreen is disabled on new user" into pi-dev