Merge "Move hint session initialization to setSurface"