am 71aa3b21: am 0d959fd4: am 7617f55e: am a8c247e0: Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev

* commit '71aa3b21e3024cd208576b987db07da90d463d02':
  Fixed a bug where collapserunnables where dropped