Merge remote-tracking branch 'origin/ios-build-sh-enhancement' into ios-iphone-7-system-keyboard-width-regression