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

Change-Id: I04a017dde4180ee9aa990964f94a06b49a341283