Merge "Revert "Revert "Use AVD for checkbox animation."""