Merge "HTMLForm OOUI Flatlist: Reduce `margin` slightly"