Merge "Fix fullscreen mode" into ics-mr0