Merge "Track buildLayer calls, destroy if unused" into lmp-dev