Merge "Fix issue where old alarm manager triggers are being listen to." into klp-dev