Merge "UX polish tweaks to FallbackHome." into nyc-dev