Merge "Stopp Cell height from changing when running ReorderUnitTest" into udc-dev