Merge "Change layout size to be dependent on device size" into ub-launcher3-master