Merge "Making ScreenOnUnblocked and ScreenOffUnblocked public"