Merge "Fix loading bar positioning." into nyc-mr2-dev
am: 50a3327bbf

Change-Id: Ifbc58bd82744f6a0b06e3547d08026f68838465b