Merge "Add NATIVE_WINDOW_CONSUMER_IS_PROTECTED enum" into oc-dev