Merge "Fix provider empty state status"