Merge "Shutdown: Continue shutdown with BLE only mode" into oc-mr1-dev