Fix opt out iframe and add screenshot test to ensure we don't regress
Merge remote-tracking branch 'origin/master'