Merge "Music: Fix crash for unable to start QueryBrowserActivity."