Merge "Revert "Add feature flag to control two panel home in portrait"" into sc-v2-dev