Merge "Creating a correctly populated mOccupied grid when reordering on foldables" into udc-qpr-dev