Bug 1058900 - [email] pinch/zoom mitigations

Seems like general feedback here is to collapse branches and iframeShimOpts if the optimal path is now identified. Along with streamlining the console.logs to be tighter, as you mentioned in IRC.