Merge "Wrong app icon position in seascape mode for RTL layout" into main