Merge "SystemUI status bar/quick settings updates." into klp-dev