Merge "Add support for cross-activity scenes and transitions"