Merge "Fix the layout flag for magnification settings" into udc-dev