Merge "Bring back silent icons for Q->Q devices" into qt-dev
am: 09dacf8183

Change-Id: If31f93cdf1cb5e6d94081efcc369d8f801c507f8