Merge "Don't use forceVisibility for Activity Transitions." into nyc-dev