Merge "Adding support for tagging animations per controller, so that they can be controlled independently" into ub-launcher3-master