Merge "Don't send the same values to onUpdateSelection repeatedly" into klp-dev