Merge "mw.Upload.BookletLayout: Rewrite some code to use promise chaining"