Merge "RESTRICT AUTOMERGE Disable Stylus Update Notification feature" into tm-qpr-dev