Merge "Move feature flags that have been changed to the top of the list." into tm-qpr-dev