Fix Grunt build.

Fix race condition on startup with touchLayer being undefined.
Merge branch '2.1devtf' of github.com:01org/appframework into 2.1devtf