Merge "Use sysproperties to check PiP2 flag for dev" into main