Merge "Fix test when running on large screen devices" into sc-v2-dev