Merge "Increase collapsed height for resolver list with default and tabs" into rvc-dev