Merge "Fix the remove button icon not centered when the home screen is in landscape." into sc-v2-dev