Merge "Fix the wrong number of icons in shelf for RTL" into pi-dev
am: 8861d33dec

Change-Id: I42aba38e24a3a9bb5c7084a07cf68ef191d07a75