Merge "Fix delay_save and multiple required fields." into qt-dev am: eea916967a am: f57a060afc
am: b19be624f0

Change-Id: I5dd57f3610568955bab0b0a680ad38db0828a18f