Merge "Resume throwing if too many concurrent alarms" into qt-dev