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

Change-Id: I66fa5b35965e0295d11deeac331d4a9e90ec5cc1