Merge "Update gesture nav edu motion and colors" into udc-dev