Merge "sys user split: refactor systemui user switcher"