Merge "Enable device identifier check for 3P apps"