Merge "Hide overview and app icon split option when appropriate" into sc-v2-dev