Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev