Merge "Flag for stylus education." into tm-qpr-dev