Merge "Apply IDumpstateListener changes"