Merge "Fixes for more robust dealing with content handlers."