Merge "DO NOT MERGE: Eliminate redundant changes to hardware vsync state." into cw-f-dev