Merge "Set some BT icon background to white" into qt-dev am: 6cb224b38b am: 23aa7a78ef
am: e0a9535211

Change-Id: Ibef9cd96ea627e3be487bb615e1a69f83a6a9893