Fix the "now playing" icon that gets sent to the system app
Merge pull request #13053 from jimporter/music-nowplaying-icon

Bug 930386 - Fix the "now playing" icon that gets sent to the system app; r=dkuo
Bug 915584 - [Bluetooth][Contacts] Receiving a contact via bluetooth when the device does not have SD Card flow differs from the expected