DO NOT MERGE Only set the LAYOUT flags if the window is fullscreen am: 5c31a5c18d

Change-Id: I984729eaf20a53d3d2a4eb1c4457141140600964