Merge "Add DashboardItemAnimator to stop flash"