Merge "Add Nokia 7 Plus in to official support"