Merge "Handle condition changes when metric is not active." into qt-dev