Merge "AOD: Increase shelf icon size while dark" into oc-dev
am: f852ed40a6

Change-Id: Ic9d9e0878695962e947a0f9cc25e012350f7ffba