Merge "Settings crashed when changing the Screen Resolution" into udc-d1-dev