Merge "Changing the dogfood check to a static boolean to better handle proguard optimizations" into ub-launcher3-master