Merge "Revert change to defer resetting systemui flags" into sc-dev