Merge "Disable unlocked screen off if the display needs blanking." into sc-dev