Merge "Fix iframe height bug"