Merge "modified iframe display bug"