Merge "Update prop config to reflect new prop changes."