Merge "Simplify Youtube <embed> management"