Merge "Use placeholderCount-1 if using default layout." into oc-dev