Merge "Removing flag management UI states from flag definition" into tm-qpr-dev