Merge "Restart BT when init flags change"