am 8a6ab821: am c6103803: am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev

* commit '8a6ab82114058eedc6aeb29902f0f3926a33a0c6':
  Fix activities appearing behind launcher icons