Merge "DecorView: Fix status guard" into qt-dev
am: f5432f1862

Change-Id: I194348b7c2a90890a616f877a9470f54fcea829a