Merge "Merge "Fixed a screen flickering on tablets" into nyc-dev am:...
Merge "Merge "Fixed a screen flickering on tablets" into nyc-dev am: ce80acd7 am: be802632" into nyc-mr1-dev-plus-aosp
am: 4713c407
* commit '4713c407':
Fixed a screen flickering on tablets
Change-Id: I011e1eb678824590d6314810dcfc55a70ce821e2