cherry-pick status updates from master

This is part of the sync-status update changes that don't touch gui.py