Merge "Bugreport progress notification should use the bug icon." am: cb783ea2ee am: 704b11756a
am: 777b2325be

Change-Id: I34c81ee801338de50e84267efceed9327414196a