Merge "Fixing controller state is not properly cleared when the animaiton is cancelled." into ub-launcher3-edmonton