Merge "Fix a dead lock while we freeze the screen." into jb-dev