Merge "Separate out sysui state updating" into qt-r1-dev
am: c7ce38df0f

Change-Id: I144bb37210335af7e64cced403f9478ce9b7fdcc