Merge "Add back a check for node provider when determining accessibility importance" into main