-> Fix bug where page switch indicator wouldn't draw on right -> Fixed some code related to folder reordering -- no behaviour change yet, but once the new AutoScroll is in, this should behave correctly (ie. shouldn't reorder while in scroll zone) Change-Id: Ic14a8d70858777164f094204472dc6a726dd461a