Merge "Ensure layout occurs before testing divider height" into mnc-dev