Merge "Fix taking actions without considering pending health checks" into qt-dev