Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev