Merge "Preventing dead lock in layout inflation" into ub-launcher3-master