Merge "Removing unnecessary view inflation" into ub-launcher3-master