Merge "Fixed a bug where parts weren't scrollable" into oc-mr1-dev