Merge "Fix settings crash" into rvc-qpr-dev