Merge "Remove weird shadow introduced by L" into lmp-dev