Merge "Revert "Making ScreenOnUnblocked and ScreenOffUnblocked public""