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

Change-Id: Iece3333145e55f462e643c72d91a904d1dae2d43