Merge "Use less SysUI specific code in Flags." into tm-qpr-dev