Merge "[Media] In MediaResumeListener, always disconnect the mediaBrowser when it changes." into tm-dev