am 725617f6: am 83aec80f: Merge "Fix hardware layers lifecycle Bug #10075732" into klp-dev

* commit '725617f66a07488f8cafda24c517e257e9eb2bc2':
  Fix hardware layers lifecycle Bug #10075732