Merge "Wait for playback when playing a browsed media item"
am: 6ee60de688

Change-Id: Idf0ab500906f815b799fa98f0ebd9d47e9aeba00