CB-7633 - Add support for iPhone 6/6+