Merge branch 'master' into fullscreen_button_hide