Merge "SysUI changes for Provider Model"