Merge "Remove developer option for bluetooth Gabeldorche"