Merge "Add userspace_reboot_config_prop property type"