Merge "Update progress bar and progress dialog to match UX specs for watch." into cw-f-dev