Merge "Don't create a file with empty favorites" into rvc-qpr-dev