Merge "Cancel launcher app transition when changing states" into ub-launcher3-master