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

Change-Id: I5ddd3fadcb7e56c1f9bf6f9ca343f7aac08a1336