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

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