Merge "Clean up system ui state flags" into qt-dev
am: 4786a567e8

Change-Id: I504ce37c3a4df2876412080f052afdd43f690af1