Merge "Supports extra layout space" into lmp-mr1-ub-dev