Merge "Allow resource override for PiP size spec" into main