Merge "Fix the wrong number of icons in shelf for RTL"