Merge "Fix a few issues with NATIVE_WINDOW_TRANSFORM_HINT"