Merge "To re-adjust the layout to pass the test in switch access and talkback" into sc-v2-dev