Merge "Unlock icon regardless of transient error" into qt-r1-dev