Merge "Add media.resolution.limit.32bit to media_config_prop"