Merge "Add feature flag to disable wifi AP on the watch." into pi-dev