Merge "Fixes scroll bar issues." into tm-dev