Merge "Fix broken test for stylus button Settings." into udc-dev