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

Change-Id: Id3469ac59c9799160eca2034ec42e029b967d00b