Merge "Try to dismiss Keyguard bypassing bouncer only for active users" into nyc-dev