Merge "Adding test-mapping group for large screen specific tests" into sc-v2-dev