gcs: Adding changes in latest gecos-chef-snitch-systray