am 80e6beb4: Ensure that layers are properly removed after animation

* commit '80e6beb48ca71a321f667e79fe35a7ab2fb4c2bf':
  Ensure that layers are properly removed after animation