Merge "Add Smooth Display option to developer in Settings" into rvc-dev