Merge "Fix the overlap issue of MainSwitch and list view." into sc-dev