Merge "Don't call onModalnessUpdated if modalness stays the same" into main