[DF-185] Added correct iPhone6/6+ ids to DeviceInfo
[DF-185] add DPI info for iPhone 6 and 6 Plus
Merge branch 'master_sp23' into to_master