Merge "Fix keywords for default home app" into nyc-dev