Merge "Fix SupportDashboardActivityTest" into rvc-dev