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

* commit '7acd8802d7c14323dfc2a5e68b1d2a82f9d3f5c0':
  Allow user shutdown broadcasts to be delivered