Merge "Make ProgressDialog a little less lame." into honeycomb