Merge "WindowInsets: Workaround for javadoc issue"