Merge "Pre P apps can't change new fields" into pi-dev