Merge "Disallow makeSceneTransitionAnimation without FEATURE_CONTENT_TRANSITIONS"