Merge "Fixed the progress bar positioning when expanded" into oc-mr1-dev
am: 4335a043bf

Change-Id: Ib1184aa7fe4f2fb9fc3c62b15d7bb8fce6a3d7e2