Merge "ANR caused by incorrect cleanup in BroadcastQueue." into lmp-mr1-dev