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

Change-Id: I0dd6e78df75795c2436a424fd9d5a4fcc37bb25c