Merge "Avoid vsync enabled when in DOZE mode (AOD)." into tm-dev