Merge "Prevent quickscrub/switch from occuring when keyguard is up"