Merge "Make the support loader activity display UI." into oc-dr1-dev