Merge "Correct the resolution illustration at the setting page" into udc-dev