- Attempted fixes for rare navigation and layout crashes

