Merge "Move caption under DecorationContainerSurface" into tm-qpr-dev