am 41f5437d: DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change...
am 41f5437d: DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
* commit '41f5437d':
DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."