Merge "Yet more layer tracking logging" into lmp-dev