Merge "Fix loading bar positioning." into nyc-mr2-dev