Merge "Add handling for disabling flip to screen off feature." into sc-dev