Merge "Check layout before calling." into mnc-ub-dev