Merge "Prevent preLayout span size lookup calls" into lmp-mr1-ub-dev