Merge "Causing webviews to hang." into ics-mr0