Merge "Add more context to Choreographer input callbacks" into main