Merge "Disable onboarding on P devices" into pi-dev