Merge changes I21fc6802,I8839c6cc

* changes:
  Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
  Revert "DO NOT MERGE Revert "Add WiFi toggle prompts - framework""