Merge "Fix issue where screen off is disabled after expanding then collapsing the shade." into sc-dev