Merge "Prevent floating mMediaBrowser reference"
am: f2e7cb40e4

Change-Id: I19eb4dcd0aa68fd160f1e5a613367e8ed021a0d2