Merge "Fix P2P PIN accept button greyed out incorrectly on config change" into udc-mainline-prod