Merge "Music: Focre close due to ActivityNoFoundException"