am 3fd1ada4: Merge "Disable layer leak tracking" into lmp-dev

* commit '3fd1ada45051a03c2d15988d8f83d4f8531092d0':
  Disable layer leak tracking