Merge "Fix wrong check in DC#needsRelativeLayeringToIme" into sc-v2-dev