Handle top!==self case of iframe detection
Merged changes from development