Merge "Fixed a screen flickering on tablets" into nyc-dev am: ce80acd73a
am: ba0639ad01
* commit 'ba0639ad018a7c66552ed790574cb6745f1cced1':
Change-Id: Ibb81549eaf4b3e42cc18135b3f128fc40625e43a
This commit is contained in: