[automerger skipped] DO NOT MERGE Only set the LAYOUT flags if the window is fullscreen am: 5c31a5c18d am: bc77f1ae78 -s ours
am skip reason: subject contains skip directive

Change-Id: I202aeb87afb75d5b17bbcadb9c83d43cc9047605