Merge "Show opportunistic provider name conditionally" into qt-dev