Merge "Fix flaky RuntimeException in CellLayout." into udc-qpr-dev