Merge "Revises the strings to meet the the activity-based accessibility feature." into rvc-dev