Merge "Handle nullable CellLayout when removing app icon from folder" into udc-qpr-dev