iOS: Use CFBundleIdentifier for bundle key
Merge branch 'dev'