Merge "Use properties for various userspace reboot timeouts" into rvc-dev