Merge "Add developer option for bluetooth Gabeldorche feature"