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

* commit '83aec80fb49000b2f32268590de5971c055febe9':
  Fix hardware layers lifecycle Bug #10075732