Merge "Make CommandQueue implement CallbackController"