Merge "Removing dependency on getApplicationInfo method added in N" into ub-launcher3-calgary