Merge "Animating button alpha instead of visibility" into main