Merge "Remove FLAG_FULLSCREEN"