Merge "Show topic settings inline if user has configured topics." into nyc-dev