Merge "Add active unlock chipbar flag" into tm-qpr-dev