Merge "OOjs UI: Backport d190bc51e60195eed81f147e9324c9ec21c9e68c"