Merge "Add media_native flag namespace"