Merge "updater_sample: Improve update completion handling"