Merge "Don't send user to permissions screen if none requested" into nyc-dev