Merge "Support high-resolution scroll" into main