Merge "AdapterState: Set BLE start timeout to 4 seconds" into pi-dev