Merge "Put dismiss end target at navigation bar" into nyc-dev