Merge "Make favorite star not clickable" into rvc-dev