Merge "Fixed autofill multi-sessions workflow so it only merge sessions flagged with FLAG_DELAY_SAVE." into qt-dev
am: 14d85303bb

Change-Id: Ia7498ecec1a3f276a547b262b9fb3c1acdeeeb54