Merge "Don't display bugreport progress when it recedes, for real..." am: 499af38623
am: 35d7f65654

Change-Id: Idcd1af6a3f41b61cd4776ae326ecd2bc19a353a4