Merge "Fix issue with camera overlapping split staging UI" into tm-dev