Merge "Fix b/5517002 by dismissing running progress dialog in onPause()." into ics-mr1