Merge "Cache force-navigation settings state" into main