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

* commit 'dad85a6c4bf51c126978d584703a5320be7f396c':
  Allow user shutdown broadcasts to be delivered