Some fixes for transition animation selection am: 808621ca54 am: 3d2acc1ab6
am: 867d9569df  -s ours

Change-Id: Ib224b9103f8cb32f12fa75f4474f38dab8443038