Merging fix for continuous iOS page reloads from cfa/master.