Merge "Percentage based layouts." into lmp-mr1-ub-dev