Merge "decide interruptions based on current data, not previous data." into mnc-dev