Merge "DecorView: Fix status guard" into qt-dev am: f5432f1862 am: 55fe653956
am: 0c0abf902b

Change-Id: I282c7ae6f8790daf7e34bb8d77f1771c00ce5c44