Merge "Fix broken test about SysUI flags" into rvc-dev