Merge "Bring back silent icons for Q->Q devices" into qt-dev