Merge "Change visibility of TvInputManager.Session.setSurface()"