Merge "Dismiss keyguard when switching user if lockscreen is disabled on new user" into pi-dev am: 87646514be
am: de458dba2f

Change-Id: I4c19926341e379bf98e971a991bca3f788a6fa6a