Merge change 5609 into donut

* changes:
  Update spinner's drawables. Clean up resources, pave the way for new animation.