Manual merge with android_develop

Add support for new DAL and return gestures