Remove harmless warning
Short circuit listener check
Correct 4Inch check for iOS8
Merge pull request #6078 from vishalduggal/misc_enhancements

Misc enhancements on iOS8 platform