Merge "Add button to enable non-emergency satellite mode for P2P" into main