Merge "Fix hardware layers lifecycle Bug #10075732" into klp-dev