Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev