Merge "Increase window freeze timeout for bigger screens." into jb-mr1-dev