Merge "Better diagnose Launcher state when there is an open folder." into udc-dev