Merge "Fix paired icon placement in landscape/seascape" into tm-dev