Merge "Add developer menu entry to enable Bluetooth inband ringing"