(3_4_X) Misc enhancements on iOS8 platform

Cherry Pick PR #6078 into 3_4_X