Merge "Fix potential out of order callbacks." into klp-dev