Merge "Shift RoundedCornerOverlay to Display window hierarchy" into tm-dev