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

Change-Id: I1cc3a86e98f0bbad282d8632c6a74147bc663960