Merge "Merge "Separate out sysui state updating" into qt-r1-dev am: c7ce38df0f am: 5df62af937" into qt-qpr1-dev-plus-aosp