Merge "Music: Fix ANR caused by too many songs in album" into android_ui.lnx.1.2-dev