[automerger skipped] Merge "Revert "Fix the icon overlay after density change"" into pi-dev
am: e59ce289b7  -s ours

Change-Id: Ied00608b3b454d8ebe8b7a5438000a07e76d8c6e