Merge "Fix media_session shell commands" into tm-dev