Merge "Don't return null from ActivityOptions.makeSceneTransitionAnimation."