Merge "Change Rounded corner overlay to be in Overlay layer" into tm-dev