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

Change-Id: I38647c664ccfada3acdb067a53b153a1ddd9da68