Merge "API for stylus handwriting settings activity"