Merge "Updating some non-final static objects" into ub-launcher3-master