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

* commit '3217cc6ff2b3139d8854a3f681da6ae1d163ac92':
  Fix activities appearing behind launcher icons