Merge "Refresh should always update the field" into qt-dev am: ae61369c0d
am: b87abd1b90

Change-Id: I99e1eb973042cc1c8e81767567552060638c226f