Merge "Update OOUI to v0.25.0"