Merge "Enable active unlock chipbar UI by default" into tm-qpr-dev