Merge "Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev am: 062d96721c am: 20843ba58c" into tm-d1-dev-plus-aosp