Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev