Merge "Fix more potential deadlocks in ALooperRoster" into lmp-dev