Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev