Merge "Fix placement bug with split staging icon in RtL" into tm-dev