Merge "Support VCN in SysUI"