Merge "Relabel minui properties as recovery_config_prop"