Merge "native window auto-format"