Merge "[Settings] Fix the layout index" into udc-dev