Merge "Use SystemUI feature flags" into tm-qpr-dev