Merge "Don't dispatch legacy insets to client"