am 9583b5a9: Merge "Fixed a bug where the QS could get stuck" into lmp-dev

* commit '9583b5a98dc265158c667a57092688407014b9b6':
  Fixed a bug where the QS could get stuck