Merge "Music: Fix UI is not showing the correct song being played." into android_ui.lnx.1.2.c1-dev