Merge "Prevent ProgressDialog from causing crash."