Merge "Revert systemui status bar provider model behavior" into sc-dev