Merge "mw.Upload.BookletLayout: Update padding/margin to match OOUI to avoid scrollbars"