Merge "Merge "Separate out sysui state updating" into qt-r1-dev am: c7ce38df" into qt-r1-dev-plus-aosp