Merge "Fix NPE where CellLayout is null when removing item out of folder" into udc-dev