Merge "Only offset header icon when description is possible to overlap keyboard" into udc-dev