Merge "Use new mw-ui-constructive Agora styles"