Merge changes I8ba68ea7,Icb95446e

* changes:
  Move Some Touch Handling out of NSSL
  Remove ScrimController from NSSL