am 2b02564b: am fa5bc081: Merge "Increase window freeze timeout for bigger...
am 2b02564b: am fa5bc081: Merge "Increase window freeze timeout for bigger screens." into jb-mr1-dev
* commit '2b02564b':
Increase window freeze timeout for bigger screens.