Merge "SysUI Tuner: Status bar work"