Merge "Fixed an issue where a user could't go to the locked shade from dozing" into sc-v2-dev