Merge "Prevent floating mMediaBrowser reference"