Merge "Update stylus gesture to access quick settings to use the new buttons" into mnc-dev