Merge "Fix Screen Off logging for Flip to Screen Off." into sc-dev