Made app_state more robust when switching branches.