Merge "Fixed an issue where the shade wouldn't stay open on unlock" into sc-dev