Merge "Update cross-profile error strings and UI" into rvc-dev