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

Change-Id: I7872b8894502b9286206f7d73563634a3ac34c3b