Merge "Clean up pre-revamped UI sections (2/3)" into udc-qpr-dev