Merge "Protect against potential endless loop in BTU task timer handling" into lmp-dev