Merge "Fix doze bug in keyguard user switcher" into sc-dev