Merge "Fix proguard flag" into ub-launcher3-master