Merge "Remove direct use of ISessionController in media cmd"