Merge "Fix Settings home lifecycle" into nyc-dev