Fixes iOS 7 viewport height issues (#14123, #13749)

Change-Id: I37e177f94673a853d68613e29f9a467d761b6317