Merge "Removing layout handling in DeviceProfile and moving it to individual views" into ub-launcher3-master