Merge "Add key grab list API" into devel/master