Merge "Close LS media player when session is destroyed" into rvc-dev am: 0dcd72e1de am: 2e20e90047

Change-Id: Ie7aa11784b75b0ad9a53055b858e57b13e9db984