Merge "Move active unlock chipbar flag to a ResourceFlag" into tm-qpr-dev