Merge "Fix premature clearing of clearable sysui flags" into mnc-dev