Merge "Prevent doubling up on split placeholder insets" into tm-qpr-dev