Merge "Fix activities appearing behind launcher icons" into klp-dev