Merge changes I602852b1,Ibb863815

* changes:
  Use legacy transitions in legacy transition system
  Update default activity animations