Merge "Add active unlock chipbar flag"