Merge "Using the new contract for some systemUI constants" into ub-launcher3-master