Merge changes I9f5900ba,Ie861d3e8

* changes:
  Rename BandController. Make GridModel top level.
  Move ContentLock and ViewAutoScroller into sel pkg.