am 96cd10b0: am 4769ecc7: Support changes in Scene Activity Transition API redo.

* commit '96cd10b02c770d8fedc73dee6be5ace49b336cb7':