Merge "Add clipToOutline to the background views in people tile layouts" into sc-dev