Merge "Updating SysUI state when back enabled/disabled state change" into rvc-dev