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

Change-Id: I5ff98e3905f7096239119d386ad5e66e351042d9