Merge "Add listener support in AVD"