Merge "mw.Upload.BookletLayout: Handle additional warnings/errors"