Merge "Mark stylus buttons mapppings as fallback" into main