Merge "Fixed the progress bar positioning when expanded" into oc-mr1-dev