Merge "Fix NPE in onFullScreenChanged message handler. Bug: 6430929" into jb-dev