Correctly using ContentWindowController. Fixed loading / restoring of sessions. Fixed touch point location.

Some unit tests are still failing.

Change-Id: Ic9d461f908a3036009b648562357139d23fcd1e5