Merge "DO NOT MERGE Only set the LAYOUT flags if the window is fullscreen" into qt-qpr1-dev am: 347c14cb47

Change-Id: Iadecb2eb91a220a3c31096e728090434cf54df65