Refactor to use latest BetterBluetoothLE library and explore using multiple activities.
Fix merge conflict.