Merge "Back key to dismiss full screen video" into jb-mr1-dev