Merge "Not rendering the dark icons with the shelf anymore" into qt-r1-dev
am: 521702935c

Change-Id: Ifd977a4d712c8645e83f32374cf972f2225410cc