Merge changes I6bda318c,Ie4d259dc

* changes:
  MediaController: Remove unused constructors
  Make ISessionManager.getSessions() return list of tokens