[automerger skipped] DO NOT MERGE Fix the icon overlay after density change
am: c769caafff  -s ours

Change-Id: Ife3579da75cc89d3b9a7059d0c2d7fe56c54d14c