Merged full screen changes