Merge "Adding feature flag for simulating two CellLayouts using one." into tm-qpr-dev