Fixed resizing in embed-iframe
Merge branch 'master' into api-1.2
Merge branch 'api-1.2'