Merge "Fixed stylus eraser being rejected by palm rejection" into cm-10.2