Properly (for real this time) handle ProgressDialogs.

Bug: 67019
(and probably others)

Change-Id: Id0eaf4b503c286d4938012a89bd75f14704874b1