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

Change-Id: I5569851b4dcc81e82eb8ae83a4f0cb8adf4d5324