Merge "Merge "Only consume status bar if FULLSCREEN is set" into qt-dev am: 89d1bdedf7" into qt-dev-plus-aosp