Merge "DO NOT MERGE: Eliminate redundant changes to hardware vsync state." into cw-f-dev am: 9e5585930a am: f613f073b2  -s ours am: 4c0bb0a09a
am: 5b4bcd21ac

Change-Id: If79fbe8a291e8e14eff877c01def5bd78a0aaedd