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

* commit 'ce805c7ce475eead0e4e3326070d7dc2983d4e70':
  Fix activities appearing behind launcher icons