Merge "HW Vsync turns off correctly in Doze/AOD." into tm-qpr-dev