Merge "Fix bug 5149918 - Can't call ProgressDialog.setProgressNumberFormat() before dialog is shown"