Merge "Revert "Back up the smooth display setting"" into udc-dev