Merge "Update the description for Smooth Display in Settings" into main