Merge "Fix test bug on StylusManagerTest" into tm-qpr-dev