Merge "Fix back button on fragments without help uris" into nyc-dev