Merge "Add a condition timer to track the duration of condition being true." into qt-dev