Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev