Merge "Merge "Add Smooth Display option to developer in Settings" into rvc-dev am: f9a021511e am: 156d912ce2 am: 1e591c16c2" into rvc-qpr-dev-plus-aosp