Merge "PIN View - Control layout based on feature flag" into sc-dev