Merge "[AWARE] Support a mix of 1.0 and 1.2 Callback registration" into pi-dev