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

Change-Id: I4667e94ab6c7ecefd0b40186081bc5bc115352fc