Merge "Maybe fix NPE - don't notifyChange if selected visibility is the same" into main